Drop patches no longer needed, refresh remaining

diff --git a/debian/changelog b/debian/changelog
index 0f205030c0ae7f8916cdb39a8d2730678c6acba3..733439765a931068b95d4265d26e0f041860fce5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+utf8proc (2.2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Drop patches no longer needed, refresh remaining
+
+ -- Graham Inggs <ginggs@debian.org>  Fri, 27 Jul 2018 09:00:25 +0000
+
 utf8proc (2.1.1-1) unstable; urgency=medium
 
   [ Peter Colberg ]

diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch
index 41ddb02e95bd0741fabca8e3b2c0e406ac8c8ff3..73fc516719dd3d1324bac6382b28656df4a77fa4 100644 (file)
--- a/debian/patches/use-unicode-data.patch
+++ b/debian/patches/use-unicode-data.patch
@@ -3,17 +3,13 @@ Description: Use unicode-data instead of downloading external files
  provided by the packages unicode-data and ttf-unifont, respectively.
 Author: Peter Colberg <peter@colberg.org>
 Forwarded: not-needed
-Last-Update: 2018-07-07
+Last-Update: 2018-07-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/data/Makefile
 +++ b/data/Makefile
-@@ -20,13 +20,13 @@
-       $(RUBY) data_generator.rb < UnicodeData.txt > $@
- 
- # GNU Unifont version for font metric calculations:
--UNIFONT_VERSION=9.0.04
-+UNIFONT_VERSION=11.0.01
+@@ -23,10 +23,10 @@
+ UNIFONT_VERSION=11.0.01
  
  unifont.ttf:
 -      $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont-$(UNIFONT_VERSION).ttf
@@ -25,12 +21,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  %.sfd: %.ttf
        $(FONTFORGE) -lang=ff -c "Open(\"$<\");Save(\"$@\");Quit(0);"
-@@ -35,31 +35,31 @@
-       $(JULIA) charwidths.jl > $@
- 
- # Unicode data version
--UNICODE_VERSION=9.0.0
-+UNICODE_VERSION=11.0.0
+@@ -38,31 +38,31 @@
+ UNICODE_VERSION=11.0.0
  
  UnicodeData.txt:
 -      $(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
@@ -64,5 +56,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -      $(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
 +      $(PERL) -pe 's,÷,/,g;s,×,+,g' < /usr/share/unicode/auxiliary/GraphemeBreakTest.txt > $@
  
+ emoji-data.txt:
+-      $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://unicode.org/Public/emoji/`echo $(UNICODE_VERSION) | cut -d. -f1-2`/emoji-data.txt
++      cp /usr/share/unicode/emoji/emoji-data.txt $@
+ 
  clean:
-       rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt unifont*.ttf unifont*.sfd
+       rm -f UnicodeData.txt EastAsianWidth.txt GraphemeBreakProperty.txt DerivedCoreProperties.txt CompositionExclusions.txt CaseFolding.txt NormalizationTest.txt GraphemeBreakTest.txt CharWidths.txt unifont*.ttf unifont*.sfd emoji-data.txt